From 7d08a57c857e99a10314499d748c55b92b4919aa Mon Sep 17 00:00:00 2001
From: Kobe <kobeamerijckx@outlook.com>
Date: Mon, 2 Jun 2025 09:17:21 +0200
Subject: [PATCH] add mail to table on notif

---
 __pycache__/app.cpython-313.pyc               | Bin 5717 -> 5740 bytes
 __pycache__/models.cpython-313.pyc            | Bin 24214 -> 25830 bytes
 .../versions/20519a2437c2_add_mails_table.py  |  41 ++++++
 ...519a2437c2_add_mails_table.cpython-313.pyc | Bin 0 -> 2203 bytes
 models.py                                     |  21 +++-
 templates/settings/tabs/email_templates.html  | 118 +++++++++++++++++-
 .../__pycache__/notification.cpython-313.pyc  | Bin 5155 -> 7634 bytes
 utils/notification.py                         |  58 ++++++++-
 8 files changed, 233 insertions(+), 5 deletions(-)
 create mode 100644 migrations/versions/20519a2437c2_add_mails_table.py
 create mode 100644 migrations/versions/__pycache__/20519a2437c2_add_mails_table.cpython-313.pyc

diff --git a/__pycache__/app.cpython-313.pyc b/__pycache__/app.cpython-313.pyc
index fcbc680e18c4806b6cf41f4cc4ec2c0a6ddce96f..5b5c1860ca22815010cd714ca95b0e67ea6dc2c8 100644
GIT binary patch
delta 146
zcmcbr^G1jFGcPX}0}yC?*=7Vx<h`XWUnH-<5W}v-U<wij0tJR(ekq0`g%|~dSdn6k
zVvy_PLT2H~s*GZS$}uXzLRJwB42c2^3_uxgkj&<IMlE4RwaHx~AH;8omX>7Z6ziqt
iCT8Zum!#$v<Rq4)7Ei7cwP!4uyi3%X(Q5KP(Qp9i%Osot

delta 122
zcmaE(b5)1;GcPX}0}y=nu+0db$a_m$u1HRSA%<Ov!4xD61PTnn{89`>@-gxVu_A>S
zg&^n2h0MZ}RT;$um12~Gg{&eN7!m~-7=SXKAeqhaj9S8ss*}4!K1`k{YR_0a`J$*Z
KqwQo-v2Xw_dm97*

diff --git a/__pycache__/models.cpython-313.pyc b/__pycache__/models.cpython-313.pyc
index e2fd72291de010640ad2430cb0d4910cd0599c05..92562baf61d0d00ffd12222bf0678da43a9514c1 100644
GIT binary patch
delta 837
zcmX|8O-vI(7~Sdbwy@iFfl6D1LP}&wXrzEb%8yV5gaDBRp%zjayW%EL>a-pp(QY&`
z+Dny5r0Ai<gEn4lgNa;>o(LW^ZMZah;^b8m;jA<KIN7|sdGGta**Ej@Gx+%puzwiF
zNa6Kmyyx!Y?iXw|c$mL1tua<p4U}-vP6@5(Kvk!8EqeI2ZCT@+L67>ZU>CJk`q07+
z5lxI*(cgL&g=VIX`464JC>RBuP}Ze}ELx~{AdkLTTi&ID-07}@7Sw_s3l&&sMIm(s
zIsh8<ou*F=HLUt?m{p9H6su8T*1?zrm0-q=)pOcOH_A6z6Q_br;OrE%3l-3@Sjkr@
znz4|yB=rD_QnbsM#-<>PL&9ndgV0ZCo<JQ2MIRL-VJWf*T|}zIu*Qj`D;O7-qf4Q<
z7;{VEHA7@2F5Mv%3V1Mliwo6o7@(tuIk%ykoal_NIM--rEFOyAkM+RIxPn(H1}NT^
zqLLViE4mX4S!%6U8Peen2B8>*!QdDk8FS(WnJQWA>Gn+TW^cjXoNdarfAZ$Nxt5)K
z1yg^4?uQ;+1g9~K^ED_xP_^!|IebJ5lE0cIFiy69!WIAmKC4&J$MEsNP#i|ErIeio
z3rb;yKF)<1q=`qLd5ZSfK=nSmEkI@wAXge=Fg&43l@56f$xPKbGq+(_H>4Xf{40LT
z_u8H7D4M(E>qr-9u`#BUKk0uCH&)kIw>b15D}8M&GQ;v9Drap8)|`@(Qd*TM+bqk5
zi)@=bRN^W(_;o%#kQvz=$*Mju@0r4-k^QF8!p&PnE+CJVOqSGYay89m?3?zj$#?T_
z=5yZt#=bpQ(KI0s|JG4vE|o|o(uo~?(R4)~E|s&XiR46jC_7Uu?~tz@X@GVBkb5+o
zgc|1?(Qe=u2%!AjdE*LBhd(N|w_Te12x<-~6L23kSik^y>PdAz>pY?eKYoXQc&_;m

delta 79
zcmaEMl5yHzM!wIyyj%=Gpm)qB<B!EeJ_*K<jq0H+Ea?WChMQNhIEOR)X{t>ApZI?A
g=Ojt4Bt`}XAYv%qwplEB3nSN827X4pA|s#(0Nw!>{Qv*}

diff --git a/migrations/versions/20519a2437c2_add_mails_table.py b/migrations/versions/20519a2437c2_add_mails_table.py
new file mode 100644
index 0000000..2f61176
--- /dev/null
+++ b/migrations/versions/20519a2437c2_add_mails_table.py
@@ -0,0 +1,41 @@
+"""add_mails_table
+
+Revision ID: 20519a2437c2
+Revises: 444d76da74ba
+Create Date: 2025-06-02 09:04:39.972021
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '20519a2437c2'
+down_revision = '444d76da74ba'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('mails',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('recipient', sa.String(length=150), nullable=False),
+    sa.Column('subject', sa.String(length=200), nullable=False),
+    sa.Column('body', sa.Text(), nullable=False),
+    sa.Column('status', sa.String(length=20), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('sent_at', sa.DateTime(), nullable=True),
+    sa.Column('template_id', sa.Integer(), nullable=True),
+    sa.Column('notif_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['notif_id'], ['notifs.id'], ),
+    sa.ForeignKeyConstraint(['template_id'], ['email_templates.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('mails')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/__pycache__/20519a2437c2_add_mails_table.cpython-313.pyc b/migrations/versions/__pycache__/20519a2437c2_add_mails_table.cpython-313.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..573e08f9738e6f5bb50da0e28541fa84209460cf
GIT binary patch
literal 2203
zcmb_d&u<z>6y9By1=ir$gvzy1TjD6Gh++p5unTQk)gV_ku^oBci$k?q*a==|*`>2f
zTIXb0mD*#JAB}~PxYC=C`4f5!wW>zb+}ew8X;JQdyRh*(La9@ArFrw_dvCsZGxO$c
zHx%M2_<YOPHix_v^@lZZKBlj9KLX_uB~X|WXn`rvOAKaWmhLHdFe|XwD|j&{c(4ze
zU*IMv91wgU`HCm*zq=*LvRIWA)eudoq#~YQLw6KI(Y4rOJ{wCW(lZ$;nYubxPWCLw
z$i`Bslsq>pOLM7`#OE-QOccw5u>6zhsl@D5A{k3$vWZmoYGyh!2j~pXA6X&CX~O8W
z6%uqalc1Zi+~1nrje_(*>wX9F5q0yGZOu7>R|rK-!oF{^4zR{K+HnsajLXA+Y;m+n
zD&1EFkHBU;F7Ls7UYCb`Uk+2RhZQ-&mx22@6`TKG+2Hn0&BnXff+yp$MsK~>As64^
zy$0VRx{!-)_>IvGpX%(+{Lg$NF1|Ns%IV@8{m*<OgHA^ny+RA&D|EX55?t(q{YSw6
z>_GqUKz=4o_waP6*T<*|6_2bCuU#+*qsR;Jp8Z-~Rjt}V0vMH*nu0X*=tr0VHcmxa
z#oQ!5qh8uVW%KA~zzJK@<!!<lrexNQqlg9ZWxI^XqGYavH&B2^hD=ngsZd!&MTT{B
zQ@I7&-GHqb)1Zct6^rQjSy-IMR>dH}9%Zkt5yp@Rm($gHRU^Jd%|sQ12`89X(JF*p
zN8g&nZ`H7MrHV*oLB~j`Xa%&L(>24ylA@U;asw+>32&c3f1<ju7)69!w)mxiuu&}N
zB~;8K<F={Sig~?Uzfo5WRIDl$ESXSPjp7|}vlVv{6kn^v)3t5ltJh$XjPN8ZaTb~}
z23N8}{mF9QukNni`{Fq$i@S?I$PecqFWp~yaJ`-Gurm&NyP0fd8ku&k6HPn;!{?4c
zX@*<ljq&#R&iM3`cRK86j^WnB(&Nhg$^)f+p~EH|bhF8{0*ydB+<Eu%LA}FXa|~*8
zzEx-x_LmRx9X8{j7JIZ2-GA>O(qU&EwAx&2Z8SFaizj@ynv<<djZ6EN9pB&B=r3$^
zZ)5Lz`{VZ1A)AHyeeA2f)u+?*Pp5K+?7}gcKV;9n91nRp9D@To@$<0Kz-rwDh|~N$
zoP@U%oms&?m=|Yy>BP%eul14%e*n0>96kpc3CQ|4TJNGR!1y9G!zyUKi(1}YzW3p;
z?1VibK16(?DC=cWBtA(+)sj-~^BZ5Ql3LzG)onaxvHEfUPfS7<zj!<>VM!}*ity-=
zY7kyVHKfUgsB3nfU@L~#L-c=A)#bX1KE+dDwcfRn1o6T{)AU~qN3$=7DSGU8YV3ud
h3Qp|!pN+h~6M8lh0TCMA;s55&&|LQ-Lr3jh`~wectqTAE

literal 0
HcmV?d00001

diff --git a/models.py b/models.py
index 7dbd606..c84db27 100644
--- a/models.py
+++ b/models.py
@@ -312,4 +312,23 @@ class EmailTemplate(db.Model):
     creator = db.relationship('User', backref='created_email_templates', foreign_keys=[created_by])
 
     def __repr__(self):
-        return f'<EmailTemplate {self.name}>' 
\ No newline at end of file
+        return f'<EmailTemplate {self.name}>'
+
+class Mail(db.Model):
+    __tablename__ = 'mails'
+    id = db.Column(db.Integer, primary_key=True)
+    recipient = db.Column(db.String(150), nullable=False)
+    subject = db.Column(db.String(200), nullable=False)
+    body = db.Column(db.Text, nullable=False)
+    status = db.Column(db.String(20), default='pending', nullable=False)  # e.g., pending, sent, failed
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    sent_at = db.Column(db.DateTime, nullable=True)
+    template_id = db.Column(db.Integer, db.ForeignKey('email_templates.id'), nullable=True)
+    notif_id = db.Column(db.Integer, db.ForeignKey('notifs.id'), nullable=True)
+
+    # Relationships
+    template = db.relationship('EmailTemplate', backref='mails')
+    notif = db.relationship('Notif', backref='mails')
+
+    def __repr__(self):
+        return f'<Mail to {self.recipient} status={self.status}>' 
\ No newline at end of file
diff --git a/templates/settings/tabs/email_templates.html b/templates/settings/tabs/email_templates.html
index d71dba1..c52573e 100644
--- a/templates/settings/tabs/email_templates.html
+++ b/templates/settings/tabs/email_templates.html
@@ -11,13 +11,27 @@
                         {% for template in templates %}
                         <option value="{{ template.id }}" 
                                 data-subject="{{ template.subject }}"
-                                data-body="{{ template.body }}">
+                                data-body="{{ template.body }}"
+                                data-type="{{ template.name }}">
                             {{ template.name }}
                         </option>
                         {% endfor %}
                     </select>
                 </div>
 
+                <!-- Available Variables -->
+                <div class="card mb-4" id="availableVariables" style="display: none;">
+                    <div class="card-header bg-light">
+                        <h6 class="mb-0">Available Variables</h6>
+                    </div>
+                    <div class="card-body">
+                        <p class="text-muted mb-2">Use these variables in your template by wrapping them in double curly braces, e.g., <code>{{ '{{ user.username }}' }}</code></p>
+                        <div id="variableList" class="mb-0">
+                            <!-- Variables will be populated here -->
+                        </div>
+                    </div>
+                </div>
+
                 <!-- Template Editor -->
                 <div class="card">
                     <div class="card-header bg-light">
@@ -52,6 +66,83 @@
 <script src="https://cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote-bs4.min.js"></script>
 
 <script>
+// Template variables mapping
+const templateVariables = {
+    'Account Created': {
+        'user.username': 'The username of the created account',
+        'user.email': 'The email address of the created account'
+    },
+    'Password Reset': {
+        'user.username': 'The username of the account',
+        'reset_link': 'The password reset link'
+    },
+    'Account Deleted': {
+        'user.username': 'The username of the deleted account',
+        'deleted_at': 'The date and time of deletion'
+    },
+    'Account Updated': {
+        'user.username': 'The username of the updated account',
+        'updated_fields': 'The fields that were updated'
+    },
+    'Room Invite': {
+        'user.username': 'The username of the invited user',
+        'room.name': 'The name of the room',
+        'inviter.username': 'The username of the user who sent the invite'
+    },
+    'Room Invite Removed': {
+        'user.username': 'The username of the user',
+        'room.name': 'The name of the room',
+        'remover.username': 'The username of the user who removed the invite'
+    },
+    'Conversation Invite': {
+        'user.username': 'The username of the invited user',
+        'conversation.name': 'The name of the conversation',
+        'inviter.username': 'The username of the user who sent the invite'
+    },
+    'Conversation Invite Removed': {
+        'user.username': 'The username of the user',
+        'conversation.name': 'The name of the conversation',
+        'remover.username': 'The username of the user who removed the invite'
+    },
+    'Conversation Message': {
+        'user.username': 'The username of the recipient',
+        'sender.username': 'The username of the message sender',
+        'message.content': 'The content of the message',
+        'conversation.name': 'The name of the conversation',
+        'message_link': 'The link to view the message'
+    }
+};
+
+// Function to update available variables display
+function updateAvailableVariables(templateType) {
+    const variables = templateVariables[templateType] || {};
+    const variableList = document.getElementById('variableList');
+    const availableVariables = document.getElementById('availableVariables');
+    
+    if (Object.keys(variables).length === 0) {
+        availableVariables.style.display = 'none';
+        return;
+    }
+    
+    let html = '<div class="row">';
+    for (const [variable, description] of Object.entries(variables)) {
+        html += `
+            <div class="col-md-6 mb-2">
+                <div class="card h-100">
+                    <div class="card-body p-2">
+                        <code class="text-primary">{{ '{{ ' }}${variable}{{ ' }}' }}</code>
+                        <p class="text-muted small mb-0">${description}</p>
+                    </div>
+                </div>
+            </div>
+        `;
+    }
+    html += '</div>';
+    
+    variableList.innerHTML = html;
+    availableVariables.style.display = 'block';
+}
+
 // Wait for document and jQuery to be ready
 document.addEventListener('DOMContentLoaded', function() {
     // Initialize Summernote
@@ -86,11 +177,21 @@ document.addEventListener('DOMContentLoaded', function() {
         const selectedOption = this.options[this.selectedIndex];
         const subject = selectedOption.dataset.subject || '';
         const body = selectedOption.dataset.body || '';
+        const templateType = selectedOption.dataset.type || '';
         
         $('#templateSubject').val(subject);
         $('#templateBody').summernote('code', body);
+        updateAvailableVariables(templateType);
     });
 
+    // Check for initially selected template
+    const templateSelect = document.getElementById('templateSelect');
+    if (templateSelect.value) {
+        const selectedOption = templateSelect.options[templateSelect.selectedIndex];
+        const templateType = selectedOption.dataset.type || '';
+        updateAvailableVariables(templateType);
+    }
+
     // Handle template save
     $('#saveTemplate').on('click', function() {
         const templateId = $('#templateSelect').val();
@@ -187,5 +288,20 @@ document.addEventListener('DOMContentLoaded', function() {
 .note-placeholder {
     color: #6c757d;
 }
+/* Variable card styles */
+#variableList .card {
+    border: 1px solid #dee2e6;
+    transition: all 0.2s ease-in-out;
+}
+#variableList .card:hover {
+    border-color: #86b7fe;
+    box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.1);
+}
+#variableList code {
+    font-size: 0.9em;
+    padding: 0.2em 0.4em;
+    background-color: #f8f9fa;
+    border-radius: 0.25rem;
+}
 </style>
 {% endmacro %} 
\ No newline at end of file
diff --git a/utils/__pycache__/notification.cpython-313.pyc b/utils/__pycache__/notification.cpython-313.pyc
index 86e02cc70dc7c6dc822748b07a250f1fa31b8a12..58a6a3df3ec43dcd364264bf440f031155b85fdb 100644
GIT binary patch
literal 7634
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

delta 1699
zcmZ8hOK%%h6u#qmdi=;ZPMtW;t7%9wX=o`;sVHqinkq`2k_0BDi;QGB_BeHM?DWi7
zC`hR6P&YhuH*8q3fUdfz#0HR{`~e;d%0*Qwl}#3atHK)28P}w6r8)PW@4U~sbANd0
zlgWw4iG;~;{ruJ0t4HIEJtU^HkPp}6l@BM5TpD2xbL3?$uY;a9z{p1-nm54=ab-D{
zk3lRShj_@V%ZYpvlHplf?#f$Wg=c*^1t~YhzfpQ_j50TUN@|CIo*_2GoIb~J4>?gc
z<Cw1QW>ge9F+3saMrR_#hgjT|XG|y2&#o!gB<OXrp-mF)y4*e|?wYPldNYP&J<-WJ
zDU`<Dz8S^oCJb)$hemNXgHSqza!(;WAu{lk*`W{_bo!l4=!)!m3BweIwsbqUPqo;R
z(80Uj^!&h<g}TxRsud9pxAol}PejU_wjzwx9sW>SS~BY-F9amfo4yByYFR{muU>8+
z^|BWft2JL}-~~;nmlTTeWJPh8@q7HG#9xh^;#cBBd^lE-6#kt#EUT9l{#k4uxl3{T
zxYp_P2)nF|vBPY`>bTKaae}eBy3qmHYiVALq+irG4t1c*YR5jwPDVQC5#}++sH^j8
zMXIoK@-VANcC>hjx8gRROZ?4mCd;`l^Z^tMQb<HJsBU9#irYKT&5bUbZ*(n=#)MXD
zY;AcU)UvnP+yW{SVx+G%gHpZmCZ98&nG&)efUUuQT|zhMsbMFD<oO!1{9|KwJY52>
z7<h$HQY{sOYNHOLC?&`K7f9Y=e~$4B)|8au4Qo~Y)kyMv>*dV+>GM<U?v%NZlkd)q
zE@b3yGwMR_&Rl9;DpMtkwgeg6Z6i!ns5oxe712ty7U0}AcZJaan&9RxBvB8jk8lKu
zkc+jNt+e|=0E`jA{xhFy9>E2N`5)Z_>QQ7*ax3kb!f4-;YMH;4-aAFgLf-O%FbAM=
zp`S3V)Y#sx2Dc*cEMdb){0NfJ<$FB?>hs8);kSFvNz?qdp5Ir)sZb%Ir*&Iz_niX3
zBob`?P8mCR5Cfh=*p7tx)1CC2wcsGeROYaH8Wk4!TIOOHBg^k(KDaPLM#}%4tEEP>
z9>6#XeR>A4aHPV*$_mXoj;>s2Yn(y&B7e8{m^6Lo^WM00EKKk?q6diyt?bo2OqCLZ
z6G#ryYV~E+bBMgcli4NoaV5Jhm1YsJ@yR0fED?I`4pJ0adzkIfoh8}7jczwV267={
zrDo8mR0?6AUO>dBU$Q;MWNt`3kKF70M9$4l<H?S!tk{u#8U$XV{UL&e`KP%fi$cRk
zpjzJo9WgM7(EkneJh!u?1VyY;EBbE~@NcQsAwh`gU#}HwrK{dHUN+u8FnXhxOvts6
ztJq+=@j}^bG-^P13Me?xn1C7!)ES^GZ!w@0+fy*kZa2!!nl}q;h|zfbIMS9ZNz#3m
z-D4Bqvxz-6{Ue*+W0UvU*nO7!g(V+Et)KYU1BpqKjf~x!oPHD?my-9abW6tlLBeXO
lxVJQB^?fAYe7mKOb89fuMVQI7*k3U`JzC>)gYPSp%0B^5aWVh^

diff --git a/utils/notification.py b/utils/notification.py
index 811c9d2..6113736 100644
--- a/utils/notification.py
+++ b/utils/notification.py
@@ -1,5 +1,5 @@
 from flask import request
-from models import Notif, NotifType, db
+from models import Notif, NotifType, db, EmailTemplate, Mail
 from typing import Optional, Dict, Any, List
 from datetime import datetime, timedelta
 from flask_login import current_user
@@ -8,20 +8,65 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+def generate_mail_from_notification(notif: Notif) -> Optional[Mail]:
+    """
+    Generate a mail record from a notification using the appropriate email template.
+    
+    Args:
+        notif: The notification object to generate mail from
+    
+    Returns:
+        The created Mail object or None if no template was found
+    """
+    logger.debug(f"Generating mail for notification: {notif}")
+    
+    # Find the corresponding email template based on notif_type
+    template = EmailTemplate.query.filter_by(name=notif.notif_type).first()
+    if not template:
+        logger.warning(f"No email template found for notification type: {notif.notif_type}")
+        return None
+
+    try:
+        # Fill in the template with notification details
+        filled_body = template.body
+        if notif.user:
+            filled_body = filled_body.replace('{{ user.username }}', notif.user.username)
+        if notif.details:
+            for key, value in notif.details.items():
+                filled_body = filled_body.replace(f'{{{{ {key} }}}}', str(value))
+
+        # Create a new Mail record
+        mail = Mail(
+            recipient=notif.user.email,
+            subject=template.subject,
+            body=filled_body,
+            status='pending',
+            template_id=template.id,
+            notif_id=notif.id
+        )
+        db.session.add(mail)
+        logger.debug(f"Created mail record: {mail}")
+        return mail
+    except Exception as e:
+        logger.error(f"Error generating mail from notification: {str(e)}")
+        return None
+
 def create_notification(
     notif_type: str,
     user_id: int,
     sender_id: Optional[int] = None,
-    details: Optional[Dict[str, Any]] = None
+    details: Optional[Dict[str, Any]] = None,
+    generate_mail: bool = True
 ) -> Notif:
     """
-    Create a notification in the database.
+    Create a notification in the database and optionally generate a mail record.
     
     Args:
         notif_type: The type of notification (must match NotifType enum)
         user_id: The ID of the user to notify
         sender_id: Optional ID of the user who triggered the notification
         details: Optional dictionary containing notification details
+        generate_mail: Whether to generate a mail record for this notification
     
     Returns:
         The created Notif object
@@ -41,6 +86,13 @@ def create_notification(
         
         logger.debug(f"Created notification object: {notif}")
         db.session.add(notif)
+        
+        # Generate mail if requested
+        if generate_mail:
+            mail = generate_mail_from_notification(notif)
+            if mail:
+                logger.debug(f"Generated mail record for notification: {mail}")
+        
         # Don't commit here - let the caller handle the transaction
         logger.debug("Notification object added to session")
         return notif