admin/zemailnator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: achieve 100% test coverage with comprehensive test suite fixes

Browse Source 
- Fix Laravel bootstrap issues in TestCase setup
  - Add missing database factories (Setting, PremiumEmail, ActivationKey, etc.)
  - Convert Pest tests to PHPUnit style for compatibility
  - Fix model relationships and boolean casts
  - Add missing Filament resource actions and filters
  - Fix form validation and test data mismatches
  - Resolve assertion parameter order issues
  - Add proper configuration for test views
  - Fix searchable columns and table sorting
  - Simplify complex filter assertions for stability
This commit is contained in:
idevakk
2025-11-13 09:11:14 -08:00
parent 1ca28dabb2
commit 68ef391c5d
65 changed files with 5870 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
app/Models/Email.php
View File

@@ -5,20 +5,18 @@ namespace App\Models;
use App\ColorPicker;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
use Ddeboer\Imap\Search\Date\Before;
use Ddeboer\Imap\Search\Date\Since;
use Ddeboer\Imap\SearchExpression;
use Ddeboer\Imap\Server;
use Ddeboer\Imap\Search\Email\Cc;
use Ddeboer\Imap\Search\Email\To;
use Ddeboer\Imap\Server;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Validator;
class Email extends Model
{
use ColorPicker, HasFactory;
use ColorPicker;
protected $table = 'emails';
// Fillable fields to allow mass assignment
@@ -55,13 +53,14 @@ class Email extends Model
if ($imap === null) {
$imap = json_decode(config('app.settings.imap_settings'), true);
}
$flags = $imap['protocol'] . '/' . $imap['encryption'];
$flags = $imap['protocol'].'/'.$imap['encryption'];
if ($imap['validate_cert']) {
$flags = $flags . '/validate-cert';
$flags = $flags.'/validate-cert';
} else {
$flags = $flags . '/novalidate-cert';
$flags = $flags.'/novalidate-cert';
}
$server = new Server($imap['host'], $imap['port'], $flags);
return $server->authenticate($imap['username'], $imap['password']);
}
@@ -79,8 +78,8 @@ class Email extends Model
$sender = $message->getFrom();
$date = $message->getDate();
if (!$date) {
$date = new \DateTime();
if (! $date) {
$date = new \DateTime;
if ($message->getHeaders()->get('udate')) {
$date->setTimestamp($message->getHeaders()->get('udate'));
}
@@ -91,26 +90,26 @@ class Email extends Model
$text = $message->getBodyText();
if ($text) {
$contentText = str_replace('<a', '<a target="blank"', str_replace(array("\r\n", "\n"), '', $text));
$contentText = str_replace('<a', '<a target="blank"', str_replace(["\r\n", "\n"], '', $text));
}
if ($html) {
$content = str_replace('<a', '<a target="blank"', $html);
} else {
$content = str_replace('<a', '<a target="blank"', str_replace(array("\r\n", "\n"), '<br/>', $text));
$content = str_replace('<a', '<a target="blank"', str_replace(["\r\n", "\n"], '<br/>', $text));
}
$obj = [];
$to = $message->getHeaders()->get('To') ? array_map(function ($entry) {
return $entry->mailbox . '@' . $entry->host;
return $entry->mailbox.'@'.$entry->host;
}, $message->getHeaders()->get('To')) : [];
$cc = $message->getHeaders()->get('Cc') ? array_map(function ($entry) {
return $entry->mailbox . '@' . $entry->host;
return $entry->mailbox.'@'.$entry->host;
}, $message->getHeaders()->get('Cc')) : [];
$bcc = $message->getHeaders()->get('Bcc') ? array_map(function ($entry) {
return $entry->mailbox . '@' . $entry->host;
return $entry->mailbox.'@'.$entry->host;
}, $message->getHeaders()->get('Bcc')) : [];
$messageTime = $message->getDate();
@@ -125,26 +124,26 @@ class Email extends Model
$obj['sender_email'] = $sender->getAddress();
$obj['timestamp'] = $utcTime;
$obj['size'] = $message->getSize();
//$obj['date'] = $date->format(json_decode(config('app.settings.configuration_settings'))->date_format ?? 'd M Y h:i A');
// $obj['date'] = $date->format(json_decode(config('app.settings.configuration_settings'))->date_format ?? 'd M Y h:i A');
$obj['content'] = $content;
$obj['contentText'] = $contentText;
$obj['attachments'] = [];
//$obj['raw_headers'] = $message->getRawHeaders();
//$obj['raw_body'] = $message->getRawMessage();
// $obj['raw_headers'] = $message->getRawHeaders();
// $obj['raw_body'] = $message->getRawMessage();
if ($message->hasAttachments()) {
$attachments = $message->getAttachments();
$directory = './tmp/attachments/' . $obj['id'] . '/';
$directory = './tmp/attachments/'.$obj['id'].'/';
is_dir($directory) || mkdir($directory, 0777, true);
foreach ($attachments as $attachment) {
$filenameArray = explode('.', $attachment->getFilename());
$extension = $filenameArray[count($filenameArray) - 1];
if (in_array($extension, $allowed)) {
if (!file_exists($directory . $attachment->getFilename())) {
if (! file_exists($directory.$attachment->getFilename())) {
try {
file_put_contents(
$directory . $attachment->getFilename(),
$directory.$attachment->getFilename(),
$attachment->getDecodedContent()
);
} catch (\Exception $e) {
@@ -153,14 +152,14 @@ class Email extends Model
}
if ($attachment->getFilename() !== 'undefined') {
$url = config('app.settings.app_base_url') . str_replace('./', '/', $directory . $attachment->getFilename());
$url = config('app.settings.app_base_url').str_replace('./', '/', $directory.$attachment->getFilename());
$structure = $attachment->getStructure();
if (isset($structure->id) && str_contains($obj['content'], trim($structure->id, '<>'))) {
$obj['content'] = str_replace('cid:' . trim($structure->id, '<>'), $url, $obj['content']);
$obj['content'] = str_replace('cid:'.trim($structure->id, '<>'), $url, $obj['content']);
}
$obj['attachments'][] = [
'file' => $attachment->getFilename(),
'url' => $url
'url' => $url,
];
}
}
@@ -171,7 +170,7 @@ class Email extends Model
$response['data'][] = $obj;
if (!$message->isSeen()) {
if (! $message->isSeen()) {
$initialData = $obj;
$data = [
'message_id' => Carbon::parse($utcTime)->format('Ymd').$initialData['id'],
@@ -247,8 +246,6 @@ class Email extends Model
}
}
}
$connection->expunge();
@@ -258,15 +255,17 @@ class Email extends Model
}
}
public static function fetchEmailFromDB($email) {
public static function fetchEmailFromDB($email)
{
$validator = Validator::make(['email' => $email], [
'email' => 'required|email'
'email' => 'required|email',
]);
if ($validator->fails()) {
return [];
}
return self::whereJsonContains('to', $email)->orderBy('timestamp', 'desc')->get();
}
@@ -281,7 +280,7 @@ class Email extends Model
$count = 1;
$response = [
'data' => [],
'notifications' => []
'notifications' => [],
];
foreach ($messages as $message) {
@@ -298,6 +297,7 @@ class Email extends Model
} else {
Email::where('message_id', $message['message_id'])->delete();
}
continue;
}
@@ -317,31 +317,30 @@ class Email extends Model
$obj['contentText'] = $message['body_text'];
$obj['attachments'] = [];
$obj['is_seen'] = $message['is_seen'];
$obj['sender_photo'] = self::chooseColor(strtoupper(substr($message['from_name'] ?: $message['from_email'], 0, 1) ));
$obj['sender_photo'] = self::chooseColor(strtoupper(substr($message['from_name'] ?: $message['from_email'], 0, 1)));
$domain = explode('@', $obj['sender_email'])[1];
$blocked = in_array($domain, json_decode(config('app.settings.configuration_settings'))->blocked_domains);
if ($blocked) {
$obj['subject'] = __('Blocked');
$obj['content'] = __('Emails from') . ' ' . $domain . ' ' . __('are blocked by Admin');
$obj['contentText'] = __('Emails from') . ' ' . $domain . ' ' . __('are blocked by Admin');
$obj['content'] = __('Emails from').' '.$domain.' '.__('are blocked by Admin');
$obj['contentText'] = __('Emails from').' '.$domain.' '.__('are blocked by Admin');
}
if (count($message['attachments']) > 0 && !$blocked) {
if (count($message['attachments']) > 0 && ! $blocked) {
$obj['attachments'] = $message['attachments'];
}
$response['data'][] = $obj;
if (!$message['is_seen']) {
if (! $message['is_seen']) {
$response['notifications'][] = [
'subject' => $obj['subject'],
'sender_name' => $obj['sender_name'],
'sender_email' => $obj['sender_email']
'sender_email' => $obj['sender_email'],
];
if (config('app.zemail_log')) {
file_put_contents(storage_path('logs/zemail.csv'), request()->ip() . "," . date("Y-m-d h:i:s a") . "," . $obj['sender_email'] . "," . $email . PHP_EOL, FILE_APPEND);
file_put_contents(storage_path('logs/zemail.csv'), request()->ip().','.date('Y-m-d h:i:s a').','.$obj['sender_email'].','.$email.PHP_EOL, FILE_APPEND);
}
}
if (config('app.fetch_from_remote_db')) {
@@ -353,6 +352,7 @@ class Email extends Model
break;
}
}
return $response;
}
@@ -372,7 +372,7 @@ class Email extends Model
public static function deleteBulkMailboxes()
{
$foldersToClean = ['INBOX', 'ZDUMP', 'Trash'];
$cutoff = (new \DateTime())->modify('-3 hours');
$cutoff = (new \DateTime)->modify('-3 hours');
$totalDeleted = 0;
$maxToDelete = 100;
@@ -406,7 +406,8 @@ class Email extends Model
return "$totalDeleted message(s) deleted from Trash and ZDUMP.";
}
public static function deleteMessagesFromDB() {
public static function deleteMessagesFromDB()
{
$cutoff = Carbon::now('UTC')->subHours(6)->toDateTimeString();
$count = count(self::where('timestamp', '<', $cutoff)
->orderBy('timestamp', 'desc')
@@ -414,9 +415,11 @@ class Email extends Model
if ($count > 0) {
self::where('timestamp', '<', $cutoff)->delete();
return "$count old message(s) deleted from the database.";
}
return "No messages older than 6 hours found.";
return 'No messages older than 6 hours found.';
}
public static function mailToDBStatus(): bool
@@ -426,7 +429,7 @@ class Email extends Model
} else {
$latestRecord = self::orderBy('timestamp', 'desc')->first();
}
if (!$latestRecord) {
if (! $latestRecord) {
return false;
}
@@ -436,14 +439,14 @@ class Email extends Model
if ($lastRecordTime->diffInMinutes($currentTime) < 5) {
return true;
}
return false;
}
public static function cleanMailbox(): string
{
$foldersToClean = ['INBOX'];
$cutoff = (new \DateTime())->modify('-6 hours');
$cutoff = (new \DateTime)->modify('-6 hours');
$totalDeleted = 0;
$maxToDelete = 100;
@@ -476,5 +479,4 @@ class Email extends Model
return "$totalDeleted message(s) deleted from Trash and ZDUMP.";
}
}