From 13750f7dbd5b5850075eefab4bacf3e782752004 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Fri, 21 Mar 2025 07:42:10 +0000
Subject: [PATCH] feat: introduce new env

---
 .env                            |  3 ++-
 app/config/variables.php        | 11 ++++++++++-
 app/views/install/compose.phtml |  3 +++
 app/worker.php                  | 13 ++++---------
 docker-compose.yml              |  3 +++
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index c68f0a0d52..c10c12613b 100644
--- a/.env
+++ b/.env
@@ -85,7 +85,8 @@ _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
-_APP_MAINTENANCE_RETENTION_AUDIT=project=1209600,console=15778800
+_APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
diff --git a/app/config/variables.php b/app/config/variables.php
index 98dd9ffec1..27463d2fee 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -1048,13 +1048,22 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                 'introduction' => '0.7.0',
                 'default' => '1209600',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
+                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
+                'introduction' => '1.6.2',
+                'default' => '15778800',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                 'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index fd05d2a0b6..7dfe14fcef 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -148,6 +148,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -340,6 +341,7 @@ $image = $this->getParam('image', '');
       - _APP_EXECUTOR_HOST
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_EMAIL_CERTIFICATES
@@ -651,6 +653,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
diff --git a/app/worker.php b/app/worker.php
index d0fa5cf4f8..3f99089eef 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -219,15 +219,10 @@ Server::setResource('abuseRetention', function () {
 });
 
 Server::setResource('auditRetention', function () {
-    return array_reduce(
-        explode(',', System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 'project=1209600,console=15778800')), // project = 14 days, console = 6 months
-        function ($carry, $part) {
-            [$key, $value] = explode('=', $part);
-            $carry[$key] = DateTime::addSeconds(new \DateTime(), -1 * (int)$value);
-            return $carry;
-        },
-        []
-    );
+    return [
+        'project' => DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('APP_MAINTENANCE_RETENTION_AUDIT', '1209600')),
+        'console' => DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', '15778800'))
+    ];
 });
 
 Server::setResource('executionRetention', function () {
diff --git a/docker-compose.yml b/docker-compose.yml
index af6a323ec8..05ddba967a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -171,6 +171,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -390,6 +391,7 @@ services:
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_EMAIL_CERTIFICATES
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
 
   appwrite-worker-databases:
     entrypoint: worker-databases
@@ -722,6 +724,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_MAINTENANCE_DELAY