fix: rename attachment_id to id

This commit is contained in:
Mohamed Marrouchi
2025-01-09 18:05:53 +01:00
parent 20cf7171fa
commit 0ac7d7cac5
16 changed files with 41 additions and 45 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -57,7 +57,7 @@ export class BlockRepository extends BaseRepository<
'url' in block.message.attachment.payload
) {
this.logger?.error(
'NOTE: `url` payload has been deprecated in favor of `attachment_id`',
'NOTE: `url` payload has been deprecated in favor of `id`',
block.name,
);
}

View File

@@ -15,8 +15,8 @@ export enum FileType {
}
export type AttachmentForeignKey = {
attachment_id: string | null;
/** @deprecated use "attachment_id" instead */
id: string | null;
/** @deprecated use "id" instead */
url?: string;
};

View File

@@ -390,7 +390,7 @@ describe('BlockService', () => {
attachments: {
type: FileType.file,
payload: {
attachment_id: '9'.repeat(24),
id: '9'.repeat(24),
url: 'http://link.to/the/file',
},
},

View File

@@ -411,7 +411,7 @@ export class BlockService extends BaseService<Block, BlockPopulate, BlockFull> {
'url' in block.message.attachment.payload
) {
this.logger.error(
'Attachment Model : `url` payload has been deprecated in favor of `attachment_id`',
'Attachment Model : `url` payload has been deprecated in favor of `id`',
block.id,
block.message,
);
@@ -521,7 +521,7 @@ export class BlockService extends BaseService<Block, BlockPopulate, BlockFull> {
}
} else if (blockMessage && 'attachment' in blockMessage) {
const attachmentPayload = blockMessage.attachment.payload;
if (!attachmentPayload.attachment_id) {
if (!attachmentPayload.id) {
this.checkDeprecatedAttachmentUrl(block);
throw new Error('Remote attachments are no longer supported!');
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -71,7 +71,7 @@ export function isValidMessage(msg: any) {
.required(),
payload: Joi.object().keys({
url: Joi.string().uri(),
attachment_id: Joi.string().allow(null),
id: Joi.string().allow(null),
}),
}),
elements: Joi.boolean(),