From c920b262f42b1ca04389282b1f8062392a226e8c Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Thu, 12 Sep 2024 12:42:32 +0000
Subject: [PATCH] fix: Retention Policy cached settings not updated during
 upgrade procedure (#33237)

---
 .changeset/pink-swans-teach.md                |  5 +++++
 apps/meteor/server/startup/migrations/xrun.ts | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/pink-swans-teach.md

diff --git a/.changeset/pink-swans-teach.md b/.changeset/pink-swans-teach.md
new file mode 100644
index 000000000000..7c85572a78d5
--- /dev/null
+++ b/.changeset/pink-swans-teach.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed retention policy max age settings not being respected after upgrade
diff --git a/apps/meteor/server/startup/migrations/xrun.ts b/apps/meteor/server/startup/migrations/xrun.ts
index 7f6c8a68ad55..0344649f9993 100644
--- a/apps/meteor/server/startup/migrations/xrun.ts
+++ b/apps/meteor/server/startup/migrations/xrun.ts
@@ -2,6 +2,7 @@ import { Settings } from '@rocket.chat/models';
 import type { UpdateResult } from 'mongodb';
 
 import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';
+import { settings } from '../../../app/settings/server';
 import { migrateDatabase, onServerVersionChange } from '../../lib/migrations';
 import { ensureCloudWorkspaceRegistered } from '../cloudRegistration';
 
@@ -23,10 +24,13 @@ const moveRetentionSetting = async () => {
 		{ _id: { $in: Array.from(maxAgeSettingMap.keys()) }, value: { $ne: -1 } },
 		{ projection: { _id: 1, value: 1 } },
 	).forEach(({ _id, value }) => {
-		if (!maxAgeSettingMap.has(_id)) {
+		const newSettingId = maxAgeSettingMap.get(_id);
+		if (!newSettingId) {
 			throw new Error(`moveRetentionSetting - Setting ${_id} equivalent does not exist`);
 		}
 
+		const newValue = convertDaysToMs(Number(value));
+
 		promises.push(
 			Settings.updateOne(
 				{
@@ -34,11 +38,17 @@ const moveRetentionSetting = async () => {
 				},
 				{
 					$set: {
-						value: convertDaysToMs(Number(value)),
+						value: newValue,
 					},
 				},
 			),
 		);
+
+		const currentCache = settings.getSetting(newSettingId);
+		if (!currentCache) {
+			return;
+		}
+		settings.set({ ...currentCache, value: newValue });
 	});
 
 	await Promise.all(promises);