refactor: update ICustomSoundsModel.setName method to return the updated sound object

Author: tassoevan

apps/meteor/app/custom-sounds/server/methods/insertOrUpdateSound.ts

@@ -87,15 +87,12 @@ Meteor.methods<ServerMethods>({
 		}
 
 		if (soundData.name !== soundData.previousName) {
-			await CustomSounds.setName(soundData._id, soundData.name);
-			void api.broadcast('notify.updateCustomSound', {
-				soundData: {
-					_id: soundData._id,
-					name: soundData.name,
-					extension: soundData.extension,
-					_updatedAt: undefined!, // FIXME,
-				},
-			});
+			const updatedSound = await CustomSounds.setName(soundData._id, soundData.name);
+			if (updatedSound) {
+				void api.broadcast('notify.updateCustomSound', {
+					soundData: updatedSound,
+				});
+			}
 		}
 
 		return soundData._id;

apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts

@@ -1,6 +1,7 @@
 import { api } from '@rocket.chat/core-services';
 import type { RequiredField } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
+import { CustomSounds } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import type { ICustomSoundData } from './insertOrUpdateSound';
@@ -28,19 +29,13 @@ Meteor.methods<ServerMethods>({
 
 		return new Promise((resolve) => {
 			const ws = RocketChatFileCustomSoundsInstance.createWriteStream(`${soundData._id}.${soundData.extension}`, contentType);
-			ws.on('end', () => {
-				setTimeout(
-					() =>
-						api.broadcast('notify.updateCustomSound', {
-							soundData: {
-								_id: soundData._id,
-								name: soundData.name,
-								extension: soundData.extension,
-								_updatedAt: undefined!, // FIXME
-							},
-						}),
-					500,
-				);
+			ws.on('end', async () => {
+				setTimeout(async () => {
+					const sound = await CustomSounds.findOneById(soundData._id);
+					if (sound) {
+						void api.broadcast('notify.updateCustomSound', { soundData: sound });
+					}
+				}, 500);
 				resolve();
 			});
 

packages/model-typings/src/models/ICustomSoundsModel.ts

@@ -1,11 +1,11 @@
 import type { ICustomSound } from '@rocket.chat/core-typings';
-import type { FindCursor, FindOptions, InsertOneResult, UpdateResult, WithId } from 'mongodb';
+import type { FindCursor, FindOptions, InsertOneResult, WithId } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
 export interface ICustomSoundsModel extends IBaseModel<ICustomSound> {
 	findByName(name: string, options?: FindOptions<ICustomSound>): FindCursor<ICustomSound>;
 	findByNameExceptId(name: string, except: string, options?: FindOptions<ICustomSound>): FindCursor<ICustomSound>;
-	setName(_id: string, name: string): Promise<UpdateResult>;
+	setName(_id: string, name: string): Promise<ICustomSound | null>;
 	create(data: Omit<ICustomSound, '_id' | '_updatedAt'>): Promise<InsertOneResult<WithId<ICustomSound>>>;
 }

packages/models/src/models/CustomSounds.ts

@@ -1,6 +1,6 @@
 import type { ICustomSound, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { ICustomSoundsModel } from '@rocket.chat/model-typings';
-import type { Collection, FindCursor, Db, FindOptions, IndexDescription, InsertOneResult, UpdateResult, WithId } from 'mongodb';
+import type { Collection, FindCursor, Db, FindOptions, IndexDescription, InsertOneResult, WithId } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -32,14 +32,14 @@ export class CustomSoundsRaw extends BaseRaw<ICustomSound> implements ICustomSou
 	}
 
 	// update
-	setName(_id: string, name: string): Promise<UpdateResult> {
+	setName(_id: string, name: string): Promise<ICustomSound | null> {
 		const update = {
 			$set: {
 				name,
 			},
 		};
 
-		return this.updateOne({ _id }, update);
+		return this.findOneAndUpdate({ _id }, update, { returnDocument: 'after' });
 	}
 
 	// INSERT