fix mailing an email

app/Models/Diocesi.php

@@ -3,15 +3,15 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Diocesi extends Model
 {
     protected $table = 'diocesi';
     protected $fillable = ['nome', 'regione'];
 
-    public function gruppi(): HasMany
+    public function gruppi(): BelongsToMany
     {
-        return $this->hasMany(Gruppo::class);
+        return $this->belongsToMany(Gruppo::class, 'diocesi_gruppo');
     }
 }

app/Models/EmailSetting.php

@@ -15,7 +15,8 @@ class EmailSetting extends Model
     protected $fillable = [
         'imap_host', 'imap_port', 'imap_encryption', 'imap_username', 'imap_password',
         'smtp_host', 'smtp_port', 'smtp_encryption', 'smtp_username', 'smtp_password',
-        'email_address', 'email_name', 'reply_to', 'sync_interval_minutes',
+        'email_address', 'email_name', 'from_email', 'from_name', 'reply_to',
+        'sync_interval_minutes',
         'last_sync_at', 'is_active', 'signature', 'signature_enabled',
         'auth_method', 'google_oauth_connection_id',
     ];
@@ -247,4 +248,38 @@ class EmailSetting extends Model
     {
         return $this->signature;
     }
+
+    public function getEffectiveFromAddress(): string
+    {
+        return $this->from_email ?: $this->email_address;
+    }
+
+    public function getEffectiveFromName(): string
+    {
+        $name = $this->from_name ?: $this->email_name;
+        if (filter_var($name, FILTER_VALIDATE_EMAIL)) {
+            return 'Glastree';
+        }
+        $name = preg_replace('/[^\p{L}\p{N}\s]/u', '', $name);
+        $name = trim($name);
+        return empty($name) ? 'Glastree' : $name;
+    }
+
+    public function getEffectiveReplyTo(): ?string
+    {
+        if ($this->from_email) {
+            return $this->from_email;
+        }
+        return $this->reply_to ?: null;
+    }
+
+    public function firme(): HasMany
+    {
+        return $this->hasMany(Firma::class);
+    }
+
+    public function firmaPredefinita(): ?Firma
+    {
+        return $this->firme()->where('is_default', true)->first() ?? $this->firme()->first();
+    }
 }

app/Models/Firma.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class Firma extends Model
+{
+    protected $table = 'firme';
+
+    protected $fillable = [
+        'email_setting_id',
+        'nome',
+        'contenuto_html',
+        'is_default',
+    ];
+
+    protected $casts = [
+        'is_default' => 'boolean',
+    ];
+
+    public function emailSetting(): BelongsTo
+    {
+        return $this->belongsTo(EmailSetting::class);
+    }
+}

app/Models/Gruppo.php

@@ -24,6 +24,8 @@ class Gruppo extends Model
         'responsabile_ids' => 'array',
     ];
 
+    protected $appends = ['email_primaria', 'telefono_primario'];
+
     public function tenant(): BelongsTo
     {
         return $this->belongsTo(Tenant::class);
@@ -39,9 +41,14 @@ class Gruppo extends Model
         return $this->hasMany(Gruppo::class, 'parent_id');
     }
 
-    public function diocesi(): BelongsTo
+    public function diocesi(): BelongsToMany
     {
-        return $this->belongsTo(Diocesi::class);
+        return $this->belongsToMany(Diocesi::class, 'diocesi_gruppo');
+    }
+
+    public function gruppoContatti(): HasMany
+    {
+        return $this->hasMany(GruppoContatto::class, 'gruppo_id');
     }
 
     public function individui(): BelongsToMany
@@ -66,6 +73,18 @@ class Gruppo extends Model
         return null;
     }
 
+    public function getEmailPrimariaAttribute(): ?string
+    {
+        return $this->gruppoContatti()->where('tipo', 'email')->where('is_primary', true)->first()?->valore
+            ?? $this->gruppoContatti()->where('tipo', 'email')->first()?->valore;
+    }
+
+    public function getTelefonoPrimarioAttribute(): ?string
+    {
+        return $this->gruppoContatti()->whereIn('tipo', ['telefono', 'cellulare'])->where('is_primary', true)->first()?->valore
+            ?? $this->gruppoContatti()->whereIn('tipo', ['telefono', 'cellulare'])->first()?->valore;
+    }
+
     public function getResponsabili()
     {
         if (empty($this->responsabile_ids)) {

app/Models/GruppoContatto.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class GruppoContatto extends Model
+{
+    protected $table = 'gruppo_contatti';
+    protected $fillable = ['gruppo_id', 'tipo', 'valore', 'etichetta', 'is_primary'];
+
+    protected $casts = [
+        'is_primary' => 'boolean',
+    ];
+
+    public function gruppo(): BelongsTo
+    {
+        return $this->belongsTo(Gruppo::class);
+    }
+}

app/Models/MailingList.php

@@ -12,7 +12,7 @@ class MailingList extends Model
     use HasTagsLight;
 
     protected $table = 'mailing_lists';
-    protected $fillable = ['tenant_id', 'user_id', 'nome', 'descrizione', 'attiva'];
+    protected $fillable = ['tenant_id', 'user_id', 'nome', 'descrizione', 'attiva', 'firma_id', 'sender_account_id'];
 
     protected $casts = ['attiva' => 'boolean'];
 
@@ -36,6 +36,16 @@ class MailingList extends Model
         return $this->hasMany(MailingMessaggio::class);
     }
 
+    public function firma(): BelongsTo
+    {
+        return $this->belongsTo(Firma::class);
+    }
+
+    public function senderAccount(): BelongsTo
+    {
+        return $this->belongsTo(SenderAccount::class);
+    }
+
     public function getIndividui()
     {
         return Individuo::whereHas('mailingContacts', function ($q) {

app/Models/MailingMessaggio.php

@@ -11,7 +11,7 @@ class MailingMessaggio extends Model
     protected $fillable = [
         'tenant_id', 'mailing_list_id', 'user_id', 'oggetto', 'corpo',
         'canale', 'stato', 'inviato_al', 'totale_destinatari', 'invii_ok', 'invii_falliti',
-        'log_falliti', 'mittente_nome', 'mittente_email',
+        'log_falliti', 'mittente_nome', 'mittente_email', 'firma_id',
     ];
 
     protected $casts = [

app/Models/User.php

@@ -197,12 +197,13 @@ class User extends Authenticatable implements CanResetPasswordContract
 
             $resetUrl = url('/password/reset/' . $token);
 
-            $fromName = $settings->email_name ?? config('app.name');
-            $fromName = preg_replace('/[^\p{L}\p{N}\s]/u', '', $fromName);
-            $fromName = trim($fromName) ?: config('app.name');
+            $fromAddress = new Address(
+                $settings->getEffectiveFromAddress(),
+                $settings->getEffectiveFromName()
+            );
 
             $email = (new Email())
-                ->from(new Address($settings->email_address, $fromName))
+                ->from($fromAddress)
                 ->to($this->email)
                 ->subject('Reset della password - ' . config('app.name'))
                 ->html(view('auth.emails.reset-password', [