Add queue log and Rabbit UI banner

Application.cfc

@@ -70,6 +70,10 @@
         <cfargument name="template" type="string" required="true" />
         <cfset request.DS = this.datasource />
         <cfset request.tableName = getEnv("PG_TABLE", "rabbit_messages") />
+        <cfset request.logTableName = getEnv("UI_LOG_TABLE", "rabbit_ui_log") />
+        <cfset request.rabbitAdminUrl = getEnv("RABBIT_ADMIN_URL", "") />
+        <cfset request.rabbitUser = getEnv("RABBIT_USER", "") />
+        <cfset request.rabbitPassword = getEnv("RABBIT_PASSWORD", "") />
 
         <cftry>
             <cfquery datasource="#request.DS#">
@@ -78,17 +82,56 @@
             <cfcatch><cfset request.db_error = cfcatch.message /></cfcatch>
         </cftry>
 
+        <cftry>
+            <cfquery datasource="#request.DS#">
+                CREATE TABLE IF NOT EXISTS #request.logTableName# (
+                    id SERIAL PRIMARY KEY,
+                    action TEXT NOT NULL,
+                    text TEXT,
+                    request_id TEXT,
+                    target_id INTEGER,
+                    queued_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+                    processed_at TIMESTAMP,
+                    status TEXT DEFAULT 'queued'
+                )
+            </cfquery>
+            <cfquery datasource="#request.DS#">
+                UPDATE #request.logTableName#
+                SET processed_at = NOW(), status = 'done'
+                WHERE status = 'queued'
+                  AND action IN ('create','update')
+                  AND request_id IS NOT NULL
+                  AND EXISTS (
+                      SELECT 1 FROM #request.tableName#
+                      WHERE test_data LIKE '%' || '[req:' || request_id || ']%'
+                  )
+            </cfquery>
+            <cfquery datasource="#request.DS#">
+                UPDATE #request.logTableName#
+                SET processed_at = NOW(), status = 'done'
+                WHERE status = 'queued'
+                  AND action = 'delete'
+                  AND target_id IS NOT NULL
+                  AND NOT EXISTS (
+                      SELECT 1 FROM #request.tableName# WHERE id = target_id
+                  )
+            </cfquery>
+            <cfcatch><cfset request.db_error = cfcatch.message /></cfcatch>
+        </cftry>
+
         <cfif CGI.REQUEST_METHOD EQ "POST" AND structKeyExists(form, "crud_action")>
             <cfset var action = lcase(form.crud_action) />
             <cfset var requestId = createUUID() />
             <cfset var payload = { "request_id" = requestId } />
+            <cfset var logText = "" />
+            <cfset var logTargetId = JavaCast("null", "") />
 
             <cftry>
                 <cfswitch expression="#action#">
                     <cfcase value="insert">
                         <cfset payload.action = "create" />
-                        <cfset payload.text = trim(form.txt_content) & " [req:" & requestId & "]" />
-                        <cfset session.last_action = { action = "create", request_id = requestId, queued_at = now(), text = trim(form.txt_content) } />
+                        <cfset logText = trim(form.txt_content) />
+                        <cfset payload.text = logText & " [req:" & requestId & "]" />
                     </cfcase>
                     <cfcase value="update">
                         <cfif NOT structKeyExists(form, "id")>
@@ -96,8 +139,9 @@
                         </cfif>
                         <cfset payload.action = "update" />
                         <cfset payload.id = val(form.id) />
-                        <cfset payload.text = trim(form.txt_content) & " [req:" & requestId & "]" />
-                        <cfset session.last_action = { action = "update", request_id = requestId, queued_at = now(), id = val(form.id), text = trim(form.txt_content) } />
+                        <cfset logText = trim(form.txt_content) />
+                        <cfset logTargetId = val(form.id) />
+                        <cfset payload.text = logText & " [req:" & requestId & "]" />
                     </cfcase>
                     <cfcase value="delete">
                         <cfif NOT structKeyExists(form, "id")>
@@ -105,7 +149,7 @@
                         </cfif>
                         <cfset payload.action = "delete" />
                         <cfset payload.id = val(form.id) />
-                        <cfset session.last_action = { action = "delete", request_id = requestId, queued_at = now(), id = val(form.id) } />
+                        <cfset logTargetId = val(form.id) />
                     </cfcase>
                     <cfdefaultcase>
                         <cfthrow message="Unknown action" />
@@ -113,10 +157,20 @@
                 </cfswitch>
 
                 <cfset publishToRabbit(payload) />
+                <cfquery datasource="#request.DS#">
+                    INSERT INTO #request.logTableName# (action, text, request_id, target_id, queued_at, status)
+                    VALUES (
+                        <cfqueryparam value="#payload.action#" cfsqltype="cf_sql_varchar">,
+                        <cfqueryparam value="#logText#" cfsqltype="cf_sql_varchar">,
+                        <cfqueryparam value="#requestId#" cfsqltype="cf_sql_varchar">,
+                        <cfqueryparam value="#logTargetId#" cfsqltype="cf_sql_integer" null="#isNull(logTargetId)#">,
+                        NOW(),
+                        'queued'
+                    )
+                </cfquery>
                 <cflocation url="#CGI.SCRIPT_NAME#" addtoken="false">
                 <cfcatch>
                     <cfset request.queue_error = cfcatch.message />
-                    <cfset structDelete(session, "last_action") />
                 </cfcatch>
             </cftry>
         </cfif>

query.cfm

@@ -8,58 +8,59 @@
         :root { --nubes-blue: #005BFF; --nubes-dark: #1A1A1A; --nubes-grey: #F8F9FA; --nubes-border: #E5E7EB; --nubes-green: #0f9d58; --nubes-red: #d93025; }
         body { font-family: 'Segoe UI', Tahoma, sans-serif; margin: 0; padding: 0; background: var(--nubes-grey); color: var(--nubes-dark); }
         .header-bg { position: sticky; top: 0; z-index: 1000; background: #fff; border-bottom: 1px solid var(--nubes-border); padding: 15px 0; box-shadow: 0 2px 10px rgba(0,0,0,0.05); }
-        .container { max-width: 1000px; margin: auto; padding: 0 20px; }
+        .container { max-width: 1100px; margin: auto; padding: 0 20px; }
         .header-content { display: flex; align-items: center; justify-content: space-between; }
         .logo { height: 40px; }
-        .main-content { padding: 40px 0; }
-        .card { background: #fff; padding: 32px; border-radius: 16px; box-shadow: 0 4px 20px rgba(0,0,0,0.04); }
+        .main-content { padding: 32px 0; }
+        .card { background: #fff; padding: 28px; border-radius: 16px; box-shadow: 0 4px 20px rgba(0,0,0,0.04); margin-bottom: 20px; }
         .btn { display: inline-flex; align-items: center; justify-content: center; cursor: pointer; padding: 12px 24px; border: none; border-radius: 8px; font-weight: 600; font-size: 14px; }
         .btn-primary { background: var(--nubes-blue); color: #fff; }
-        .btn-action { padding: 12px; background: #fff; border: 1px solid var(--nubes-border); border-radius: 8px; font-size: 24px; line-height: 1; cursor: pointer; min-width: 50px; }
+        .btn-action { padding: 12px; background: #fff; border: 1px solid var(--nubes-border); border-radius: 8px; font-size: 22px; line-height: 1; cursor: pointer; min-width: 46px; }
         .btn-action:hover { background: var(--nubes-grey); border-color: var(--nubes-blue); }
-        .input-group { display: flex; gap: 12px; margin-bottom: 16px; }
+        .input-group { display: flex; gap: 12px; margin-bottom: 12px; }
         input[type="text"] { flex-grow: 1; padding: 12px 16px; border: 1px solid var(--nubes-border); border-radius: 8px; font-size: 14px; }
         table { width: 100%; border-collapse: collapse; }
-        th { text-align: left; padding: 16px; font-size: 12px; text-transform: uppercase; color: #6B7280; border-bottom: 1px solid var(--nubes-border); }
-        td { padding: 16px; border-bottom: 1px solid var(--nubes-border); }
+        th { text-align: left; padding: 12px; font-size: 12px; text-transform: uppercase; color: #6B7280; border-bottom: 1px solid var(--nubes-border); }
+        td { padding: 12px; border-bottom: 1px solid var(--nubes-border); vertical-align: top; }
         tbody tr:nth-child(even) { background-color: #FAFBFC; }
         tbody tr:hover { background-color: #F3F4F6; }
         .id-cell { font-family: monospace; color: #9CA3AF; width: 60px; }
-        .actions-cell { display: flex; gap: 12px; width: 130px; }
-        .alert { padding: 12px 16px; border-radius: 10px; margin-bottom: 20px; font-size: 14px; }
+        .actions-cell { display: flex; gap: 10px; width: 120px; }
+        .alert { padding: 12px 16px; border-radius: 10px; margin-bottom: 16px; font-size: 14px; }
         .alert-info { background: #eef4ff; color: #234; border: 1px solid #d6e3ff; }
         .alert-success { background: #eef8f1; color: #1e4620; border: 1px solid #cbe6d3; }
         .alert-error { background: #fdeeee; color: var(--nubes-red); border: 1px solid #f4c7c3; }
+        .badge { display: inline-block; padding: 4px 10px; border-radius: 999px; font-size: 12px; font-weight: 600; }
+        .badge-queued { background: #eef4ff; color: #1d3b8b; }
+        .badge-done { background: #eef8f1; color: #1e4620; }
+        .small { font-size: 12px; color: #6B7280; }
+        .top-info { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; }
+        .link-row { display: flex; gap: 10px; align-items: center; }
+        .link-row a { color: var(--nubes-blue); text-decoration: none; font-weight: 600; }
     </style>
 </head>
 <body>
 <cfset status = {}>
+<cfset rabbitAdminUrl = request.rabbitAdminUrl>
+<cfset rabbitUser = request.rabbitUser>
+<cfset rabbitPassword = request.rabbitPassword>
+
+<cfquery name="qLog" datasource="#request.DS#">
+    SELECT id, action, text, request_id, target_id, queued_at, processed_at, status
+    FROM #request.logTableName#
+    ORDER BY id DESC
+    LIMIT 20
+</cfquery>
+
 <cfif structKeyExists(request, "queue_error")>
     <cfset status.type = "error">
     <cfset status.message = "Ошибка постановки в очередь: " & request.queue_error>
-<cfelseif structKeyExists(session, "last_action")>
-    <cfset la = session.last_action>
-    <cfset status.type = "info">
-    <cfset status.message = "Поставлено в очередь: " & uCase(la.action) & " в " & dateTimeFormat(la.queued_at, "yyyy-mm-dd HH:nn:ss")>
-    <cfif la.action EQ "delete">
-        <cfquery name="qCheck" datasource="#request.DS#">
-            SELECT id FROM #request.tableName# WHERE id = <cfqueryparam value="#la.id#" cfsqltype="cf_sql_integer">
-        </cfquery>
-        <cfif qCheck.recordCount EQ 0>
-            <cfset status.type = "success">
-            <cfset status.message = "Исполнено в " & dateTimeFormat(now(), "yyyy-mm-dd HH:nn:ss")>
-            <cfset structDelete(session, "last_action")>
-        </cfif>
+<cfelseif qLog.recordCount GT 0>
+    <cfset status.type = qLog.status[1] EQ "done" ? "success" : "info">
+    <cfif qLog.status[1] EQ "done">
+        <cfset status.message = "Исполнено в " & dateTimeFormat(qLog.processed_at[1], "yyyy-mm-dd HH:nn:ss")>
     <cfelse>
-        <cfset reqToken = "[req:" & la.request_id & "]">
-        <cfquery name="qCheck" datasource="#request.DS#">
-            SELECT id, created_at FROM #request.tableName# WHERE test_data LIKE <cfqueryparam value="%#reqToken#%" cfsqltype="cf_sql_varchar"> ORDER BY id DESC LIMIT 1
-        </cfquery>
-        <cfif qCheck.recordCount GT 0>
-            <cfset status.type = "success">
-            <cfset status.message = "Исполнено в " & dateTimeFormat(qCheck.created_at, "yyyy-mm-dd HH:nn:ss")>
-            <cfset structDelete(session, "last_action")>
-        </cfif>
+        <cfset status.message = "Поставлено в очередь: " & uCase(qLog.action[1]) & " в " & dateTimeFormat(qLog.queued_at[1], "yyyy-mm-dd HH:nn:ss")>
     </cfif>
 </cfif>
 
@@ -70,6 +71,25 @@
     </div>
 </div>
 <div class="container main-content">
+    <div class="card">
+        <div class="top-info">
+            <div>
+                <div class="small">RabbitMQ UI</div>
+                <div class="link-row">
+                    <cfif len(rabbitAdminUrl)>
+                        <a href="<cfoutput>#rabbitAdminUrl#</cfoutput>" target="_blank">Открыть Rabbit UI</a>
+                    <cfelse>
+                        <span class="small">URL не задан</span>
+                    </cfif>
+                </div>
+            </div>
+            <div>
+                <div class="small">Логин / Пароль</div>
+                <div><cfoutput>#rabbitUser#</cfoutput> / <cfoutput>#rabbitPassword#</cfoutput></div>
+            </div>
+        </div>
+    </div>
+
     <div class="card">
         <cfif structKeyExists(request, "db_error")>
             <div class="alert alert-error">Ошибка базы данных: <cfoutput>#request.db_error#</cfoutput></div>
@@ -85,7 +105,41 @@
             <input type="text" name="txt_content" placeholder="Новое сообщение..." required>
             <button type="submit" class="btn btn-primary">Поставить в очередь</button>
         </form>
+        <div class="small">💾 — сохранить (update), 🗑 — удалить</div>
+    </div>
 
+    <div class="card">
+        <h3>Очередь (лог отправки)</h3>
+        <table>
+            <thead>
+                <tr>
+                    <th>ID</th>
+                    <th>Действие</th>
+                    <th>Текст</th>
+                    <th>Queued</th>
+                    <th>Processed</th>
+                    <th>Статус</th>
+                </tr>
+            </thead>
+            <tbody>
+                <cfoutput query="qLog">
+                <tr>
+                    <td class="id-cell">#id#</td>
+                    <td>#uCase(action)#</td>
+                    <td>#HTMLEditFormat(text)#</td>
+                    <td>#dateTimeFormat(queued_at, "yyyy-mm-dd HH:nn:ss")#</td>
+                    <td><cfif len(processed_at)>#dateTimeFormat(processed_at, "yyyy-mm-dd HH:nn:ss")#<cfelse>-</cfif></td>
+                    <td>
+                        <span class="badge <cfif status EQ 'done'>badge-done<cfelse>badge-queued</cfif>">#status#</span>
+                    </td>
+                </tr>
+                </cfoutput>
+            </tbody>
+        </table>
+    </div>
+
+    <div class="card">
+        <h3>База (фактические записи)</h3>
         <cfquery name="qGet" datasource="#request.DS#">SELECT * FROM #request.tableName# ORDER BY id DESC LIMIT 20</cfquery>
         <table>
             <thead><tr><th>ID</th><th>Содержимое</th><th>Действия</th></tr></thead>